Merge changes Ifb1e44bd,Ic2632a12 into pie-cts-dev

* changes:
  Relax BitmapTest.testDrawingHardwareBitmapNotLeaking
  Relax fd leak check