Merge "Make more Treble make variables read only." am: cbf6fd55bf
am: 9642570a1b

Change-Id: Ibb439a4204b971078f275f8d97a31edb55195803