Fix resource leak: When call MediaMetadataRetriever.setDataSource or getFrameAtTime should ensure call release in finally to avoid resource leak
                   Patch set 2: Remove unnecessary white spaces

Change-Id: I49a7f2fb99dc8b9560e7c17421125356e45a87ac
Revert "makefile changes for gcm javadocs"

We don't build it, nor do we have these sources.

This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e.

Change-Id: I877e617f90de1b832e26c98adbafc6238b98882f