Revert modifications to LinearLayout.

These changes were originally required when theming was not able to do
low-level asset redirection.  Some legacy functionality may depend on
this, but it should be updated to the new approach.

Change-Id: I8304f5769d8ccab7c9c3ef0d77fd48ce98c718d5