am 70e1eb86: (-s ours) 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 '70e1eb86fd3ec1ef3a3f4c2f4c951368ecdb89ae':
  Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]