am 3fef7abf: am 70d72265: am 9d474197: am 107e1fb4: am ae74287e: (-s ours) am fca5e557: Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev

* commit '3fef7abf16c5df9a6a6a24fe0ddbe7c96d69ae2f':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]