media_profiles: audio and video bitrate must match on matching sizes

Change-Id: Id09a8546cae57fc3b8a2cddb707494d020bbb5c2
props: disable hw aac encoder

Change-Id: I0b1b469c3265bd0d5f76c7f4eeced8f7e4eef4e5
g3: wifi: add hostapd_default.conf for wcnss variants

* need to enable it in your variant tree

Change-Id: Ic2913ff5bef9116361f3e03214aff3cd2d525768
Merge "props: disable hw aac encoder" into cm-12.0
Merge "media_profiles: audio and video bitrate must match on matching sizes" into cm-12.0
g3: configure offmode charging

* mercilessly kanged from oppo

Change-Id: I3e9756f298ae5cffa7b7710cec86ada49ce5e204
Merge branch 'remote' into mkl