Update to aosp r7

Signed-off-by: Dragon <dragon7780@hotmail.nl>
Remove AOSP QCOM media branches

* New direct path mappings allow all variants to share this.

Signed-off-by: Dragon <dragon7780@hotmail.nl>