Merge "libbinder: BpBinder: hide layout" am: e1bff7cf42
am: 94f6b2158d

Change-Id: Ic83f0f6602432523ecef2215273bf50452d7beda