Merge "Don't install *.mountpoint targets" am: 412d49349e
am: 645a82073d

Change-Id: I22c281f8e8efb8386bdf29bc05d93435d1146f71