(cherry-picked from vlc-android commits:
        3ef336c2ac667932c36338efe65be6bda0515e75,
        ec890fd36a3a5410c8e6c5af6f67275dab4f9290,
        c8dccbaf8bc525b1084998da3535b8ea8aae9f3f,
        79740e9ffa7d30de28f3bc6e38163ee10ad78c0d,
        a62f5ad965ff08d9fb62a4594717065050a6871c)