Merge "ENABLE_TREBLE is deprecated" into oc-dev
am: ef8716c93a

Change-Id: I6bbfbcec37b30278c3343248e4c10f55e025d446