am 5e083024: ADT/Layoutlib: shader clean-up.

Merge commit '5e083024269e7c5bf904301a98fa6eade6fec094' into eclair-plus-aosp

* commit '5e083024269e7c5bf904301a98fa6eade6fec094':
  ADT/Layoutlib: shader clean-up.